Improve some return_if_fail checks, and add the missing non-Xcursor

2005-06-17  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkcursor-x11.c:
	* gdk/gdkcursor.c: Improve some return_if_fail checks,
	and add the missing non-Xcursor fallback for
	_gdk_x11_cursor_update_theme(), noticed by Jeroen
	Zwartepoorte.

diff --git a/ChangeLog b/ChangeLog
index 97f309a7460b3594ade83137a339bc6384504514..6923994599047d879ff788feb233b44178363ae7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-06-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkcursor-x11.c: 
+       * gdk/gdkcursor.c: Improve some return_if_fail checks,
+       and add the missing non-Xcursor fallback for 
+       _gdk_x11_cursor_update_theme(), noticed by Jeroen 
+       Zwartepoorte.
+
        * gtk/gtkbutton.c (gtk_button_class_init): Document
        several button signals as not useful.
 
@@ -485,8 +491,6 @@ Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
        * gtk/gtkimage.c: Make the file property readable.  
        (#170674, Lorenzo Gil Sanchez)
 
-==================================================================
-==================================================================
        
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 97f309a7460b3594ade83137a339bc6384504514..6923994599047d879ff788feb233b44178363ae7 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,11 @@
 2005-06-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkcursor-x11.c: 
+       * gdk/gdkcursor.c: Improve some return_if_fail checks,
+       and add the missing non-Xcursor fallback for 
+       _gdk_x11_cursor_update_theme(), noticed by Jeroen 
+       Zwartepoorte.
+
        * gtk/gtkbutton.c (gtk_button_class_init): Document
        several button signals as not useful.
 
@@ -485,8 +491,6 @@ Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
        * gtk/gtkimage.c: Make the file property readable.  
        (#170674, Lorenzo Gil Sanchez)
 
-==================================================================
-==================================================================
        
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 97f309a7460b3594ade83137a339bc6384504514..6923994599047d879ff788feb233b44178363ae7 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,11 @@
 2005-06-17  Matthias Clasen  <mclasen@redhat.com>
 
+       * gdk/x11/gdkcursor-x11.c: 
+       * gdk/gdkcursor.c: Improve some return_if_fail checks,
+       and add the missing non-Xcursor fallback for 
+       _gdk_x11_cursor_update_theme(), noticed by Jeroen 
+       Zwartepoorte.
+
        * gtk/gtkbutton.c (gtk_button_class_init): Document
        several button signals as not useful.
 
@@ -485,8 +491,6 @@ Fri Jun 10 19:06:03 2005  Manish Singh  <yosh@gimp.org>
        * gtk/gtkimage.c: Make the file property readable.  
        (#170674, Lorenzo Gil Sanchez)
 
-==================================================================
-==================================================================
        
 2005-06-08  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 1038d7347991856a8415ac5b362346acf85cce71..2902ff10e52f464d24ec6a16fe360f25319e5ef0 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -53,7 +53,7 @@ gdk_cursor_get_type (void)
 GdkCursor*
 gdk_cursor_ref (GdkCursor *cursor)
 {
-  g_return_val_if_fail (cursor != NULL, NULL);
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
   g_return_val_if_fail (cursor->ref_count > 0, NULL);
 
   cursor->ref_count += 1;
@@ -72,7 +72,7 @@ gdk_cursor_ref (GdkCursor *cursor)
 void
 gdk_cursor_unref (GdkCursor *cursor)
 {
-  g_return_if_fail (cursor != NULL);
+  g_return_if_fail (GDK_IS_CURSOR (cursor));
   g_return_if_fail (cursor->ref_count > 0);
 
   cursor->ref_count -= 1;

diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 4ebeb7be3c3dfbd52dd80bacb26ef3be6a9839c1..c4b07d5e6b6f324561906e4f71aa76ac7fd3055d 100644 (file)
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -255,7 +255,7 @@ _gdk_cursor_destroy (GdkCursor *cursor)
 {
   GdkCursorPrivate *private;
 
-  g_return_if_fail (cursor != NULL);
+  g_return_if_fail (GDK_IS_CURSOR (cursor));
   g_return_if_fail (cursor->ref_count == 0);
 
   private = (GdkCursorPrivate *) cursor;
@@ -277,7 +277,7 @@ _gdk_cursor_destroy (GdkCursor *cursor)
 Display *
 gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
 {
-  g_return_val_if_fail (cursor != NULL, NULL);
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
 
   return GDK_DISPLAY_XDISPLAY(((GdkCursorPrivate *)cursor)->display);
 }
@@ -293,7 +293,7 @@ gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
 Cursor
 gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
 {
-  g_return_val_if_fail (cursor != NULL, None);
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), None);
 
   return ((GdkCursorPrivate *)cursor)->xcursor;
 }
@@ -312,7 +312,7 @@ gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
 GdkDisplay *
 gdk_cursor_get_display (GdkCursor *cursor)
 {
-  g_return_val_if_fail (cursor != NULL, NULL);
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
 
   return ((GdkCursorPrivate *)cursor)->display;
 }
@@ -346,7 +346,7 @@ gdk_cursor_get_image (GdkCursor *cursor)
   GdkPixbuf *pixbuf;
   gchar *theme;
   
-  g_return_val_if_fail (cursor != NULL, NULL);
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
 
   private = (GdkCursorPrivate *) cursor;
     
@@ -498,7 +498,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
 GdkPixbuf*  
 gdk_cursor_get_image (GdkCursor *cursor)
 {
-  g_return_val_if_fail (cursor != NULL, NULL);
+  g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
   
   return NULL;
 }
@@ -509,8 +509,12 @@ gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                  const gint   size)
 {
   g_return_if_fail (GDK_IS_DISPLAY (display));
+}
 
-  /* nothing to do */
+void
+_gdk_x11_cursor_update_theme (GdkCursor *cursor)
+{
+  g_return_if_fail (GDK_IS_CURSOR (cursor));
 }
 
 #endif